From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 4 Sep 2013 11:54:53 +0000 (+0200)
Subject: appDisplay: Fix return value for _onScroll
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3505
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2980515c857e8ebbd4607104e0620d856892337e;p=gnome-shell.git

appDisplay: Fix return value for _onScroll

ClutterActor::scroll-event has a boolean return value to indicate
whether the event has been handled, or event emission should continue.
Now that we are using an StScrollView, we depend on this to avoid
propagating the event to the view's own handler.

https://bugzilla.gnome.org/show_bug.cgi?id=707409
---

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 70b63efe0..ece06a56d 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -401,8 +401,8 @@ const AllView = new Lang.Class({
     },
 
     _onScroll: function(actor, event) {
-         if(this._displayingPopup)
-            return;
+        if (this._displayingPopup)
+            return true;
         let direction = event.get_scroll_direction();
         if (direction == Clutter.ScrollDirection.UP) {
             if (this._currentPage > 0)
@@ -413,6 +413,7 @@ const AllView = new Lang.Class({
                     this.goToPage(this._currentPage + 1);
             }
         }
+        return true;
     },
 
     _onPan: function(action) {